Remove scraggling conflict marker.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3605 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/testo b/gpsbabel/testo
index f81aa1344a0e8125f7b2d63bb79425e893ec7d7a..4006387465f0605db69e667360b987029ece6d21 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -1524,7 +1524,6 @@ gpsbabel -i gpx -f ${REFERENCE}/track/tcxtest.gpx -o gtrnctr,course=1 -F ${TMPDI
 compare ${REFERENCE}/track/tcxtest~gpx-course.tcx ${TMPDIR}/tcxtest~gpx-course.tcx
 gpsbabel -i gpx -f ${REFERENCE}/track/tcxtest.gpx -o gtrnctr,course=0 -F ${TMPDIR}/tcxtest~gpx-history.tcx
 compare ${REFERENCE}/track/tcxtest~gpx-history.tcx ${TMPDIR}/tcxtest~gpx-history.tcx
->>>>>>> 1.210
 
 #
 # Memory-Map Navigator overlay files (.mmo)